bitkeeper revision 1.990.2.1 (40d6b31eZCnLR-C0go7i0W-wiLcASA)

Restore brctl call in netfix.

diff --git a/tools/xenmgr/netfix b/tools/xenmgr/netfix
index 26c965260dbc9fc0b2fd0a122c4e2da7ef2e192e..65c354490d1e9952ac0718d076e8546fd80197f5 100644 (file)
--- a/tools/xenmgr/netfix
+++ b/tools/xenmgr/netfix
@@ -85,11 +85,10 @@ def reconfigure(interface, bridge):
     if not intf_info['gateway']:
         print 'Gateway not found: ', interface
         return
-    cmd(CMD_IFCONFIG, '%(interface)s 0.0.0.0' % intf_info)
     cmd(CMD_IFCONFIG, '%(bridge)s %(address)s netmask %(mask)s broadcast %(broadcast)s up' % intf_info)
     cmd(CMD_ROUTE, 'add default gateway %(gateway)s dev %(bridge)s' % intf_info)
-    if os.path.exists(CMD_BRCTL):
-        cmd(CMD_BRCTL, 'addif %(bridge)s %(interface)s' % intf_info)
+    cmd(CMD_BRCTL, 'addif %(bridge)s %(interface)s' % intf_info)
+    cmd(CMD_IFCONFIG, '%(interface)s 0.0.0.0' % intf_info)
 
 defaults = {
     'interface': 'eth0',